auto merge of #995 : alexcrichton/cargo/issue-808, r=huonw
authorbors <bors@rust-lang.org>
Sun, 30 Nov 2014 08:14:16 +0000 (08:14 +0000)
committerbors <bors@rust-lang.org>
Sun, 30 Nov 2014 08:14:16 +0000 (08:14 +0000)
Closes #808


Trivial merge